Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 2 Sep 2010 02:12:28 +0000 (02:12 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 2 Sep 2010 02:12:28 +0000 (02:12 +0000)

Trivial merge